From 65e277c5d22dab7ce9283ee6332e4d7825c8ed6c Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Fri, 23 Jan 2004 19:59:49 +0000 Subject: [PATCH] Don't crash when there are no columns, or all columns are hidden, #131402 Fri Jan 23 14:56:18 2004 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash when there are no columns, or all columns are hidden, #131402 --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 22 ++++++++++++++++------ 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index da042c01f2..d37afcd8ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 23 14:56:18 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash + when there are no columns, or all columns are hidden, #131402 + Fri Jan 23 16:58:28 2004 Soeren Sandmann * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index da042c01f2..d37afcd8ad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jan 23 14:56:18 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash + when there are no columns, or all columns are hidden, #131402 + Fri Jan 23 16:58:28 2004 Soeren Sandmann * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index da042c01f2..d37afcd8ad 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Jan 23 14:56:18 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash + when there are no columns, or all columns are hidden, #131402 + Fri Jan 23 16:58:28 2004 Soeren Sandmann * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index da042c01f2..d37afcd8ad 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jan 23 14:56:18 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash + when there are no columns, or all columns are hidden, #131402 + Fri Jan 23 16:58:28 2004 Soeren Sandmann * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index da042c01f2..d37afcd8ad 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jan 23 14:56:18 2004 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash + when there are no columns, or all columns are hidden, #131402 + Fri Jan 23 16:58:28 2004 Soeren Sandmann * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index b3291d432d..271fc41b95 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -10620,14 +10620,24 @@ gtk_tree_view_get_path_at_pos (GtkTreeView *tree_view, remaining_x -= tmp_column->width; } + /* If found is FALSE and there is a last_column, then it the remainder + * space is in that area + */ if (!found) { - if (column) - *column = last_column; - - if (cell_x) - *cell_x = last_column->width + remaining_x; - } + if (last_column) + { + if (column) + *column = last_column; + + if (cell_x) + *cell_x = last_column->width + remaining_x; + } + else + { + return FALSE; + } + } } y_offset = _gtk_rbtree_find_offset (tree_view->priv->tree, -- 2.30.2